tests: prepend to an existing LD_LIBRARY_PATH, GI_TYPELIB_PATH

If we're using LD_LIBRARY_PATH for some locally-built library, we want
to search those after OSTree's own libraries.

Signed-off-by: Simon McVittie <smcv@debian.org>
Closes: #606
Approved by: cgwalters

diff --git a/Makefile-tests.am b/Makefile-tests.am
index 03e50b9b46f4dc0560d35c0d7ba4c5b4618b11ea..517f713bcb119e050c0c6098781ead763e8aea3b 100644 (file)
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -28,8 +28,8 @@ EXTRA_DIST += \
 # include the builddir in $PATH so we find our just-built ostree
 # binary.
 TESTS_ENVIRONMENT += OT_TESTS_DEBUG=1 \
-       GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd) \
-       LD_LIBRARY_PATH=$$(cd $(top_builddir)/.libs && pwd) \
+       GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd)$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH} \
+       LD_LIBRARY_PATH=$$(cd $(top_builddir)/.libs && pwd)$${LD_LIBRARY_PATH:+:$${LD_LIBRARY_PATH}} \
        PATH=$$(cd $(top_builddir)/tests && pwd):$${PATH} \
        $(NULL)